Minor cosmetic changes, mostly comment adjustments to make them the
same.