I made some Hint cleanups, and squashed them together for easier examination...

Hi Guys,

This is a second attempt to cleanup fragment of our code base. (Previous was #700.)

I split features into another branch.