Make the generic regexp non-greedy, like it was before moving to `rx'.