Improve Regular Expression Speed

Replace regular expression literal with constant, to follow existing
style. Replace greedy match with non-greedy match.

Tests reveal modest speed increase.