Use the new comment model. Fixes #461
Merge pull request #604 from kytrinyx/migrate-nits

Use the new comment model. Fixes #461