Fix some leftovers from f218207a1
Merge pull request #299 from hcking/finish_comment_work

Fix some leftovers from f218207a1