Making the regex just a little less greedy.