First round refactoring. Set almost everything on fire. (The night is
dark and full of terror.)