Remove superfluous comment
Rx'ify many regexps