Tightened up comment matching