Moved frozen vars back to their methods.