During prototyping, I sprinkled the code with lots of XXX comments for figuring stuff out later. Let's resolve all of those.