Comments are now matched more robustly