Revert "Refactored some casts"
Partial work, split off from another review, and unreviewed.
This reverts commit 06940c77181ad719d77025db33903acf5fa72edc.