Ystats

Reduce book-keeping Lukas's cleanup by using an Enumeration and a ValueSet or two.

Enumeration rocks!

See if this passes tests this morning.

I wanted to PR against lrytz, but the UI doesn't show me how. :(