This pull request just exists to have a place to put comments.  Please don't pull!

Maybe group the constants together ...