Do a quick sweep through the codebase to eliminate some reinterpret_cast<>s where less fire power would do just fine.