Finally properly handle comments (even URLs!)