re #155: Simplify the regular expression