Re-add a comment accidentally removed in the previous commit; and other minor follow-up fixes.