0.9.2: Rework regexps.