Fix returning to game with ESC or other mapped back button, minor
cleanups.