Adjust comment stripping heuristic for cq

Closes #89.