Comment-ize.

Will probably squash this in somewhere when rebasing.