Moved regexp material around