Add nine ###-comments arising from code-read with Heikki.