simplified regex further (refs #252)