More fixes to regexps, making them a bit simpler