Probable implementation of comments
Reverting to 0c861b626358ffaf1b3324183a58a7bc848e15c9.

I've suddenly realized that state machine approach is crap.
So we're going back to handcoded one.
Merge remote-tracking branch 'origin/naive-comments'