More evil cast removal.
11 files changed