Comment cleanups suggested by p-march.