Argh, fuck it. Rename fixed (pointer) versions of OnMode to OnMode2