Add some comments missed during conversion.
A few more minor cleanups.