De-pluralize comment class

...we're only binding a single comment at a time anyway.
Various fixes to comment binding