Follow-up to c517854; cleaned up comments.