Fixes CompositeGamer as well, and cleans up debugging code.