Comment about future work
Fix up stats.

Satisfyingly delete a long comment explaining how somehow it is annoying
to work with a codebase that's full of singletons.