... and remove most of the casting that used to be necessary.