Update some regular expressions

Previous expressions were too greedy.