Just some cleanups

Restored Prefer32Bit, and removed unnecessary unsafe keywords.