Harden comment using greedy matching. Added more tests.