More progress with the refactor. Tiny bit of cleanup to ensure States have access to the game core.