OClint: slightly more robust regexps.