More small cleanups in motogame