Mostly comment tweaks.