Moved more stuff out of rage.h