Add some comments and a few style fixes.

In responding to questions from someone working on a port I found a few things I wanted to comment better.
I think that is correct. Regardless, the comment does not seem to add much clarity, perhaps remove it plus this TODO?