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

Agreed. Will move these to the natty header file too!