I couldn't seem to make this work nicely by combining it with the other branch, presumably because this isn't necessarily running until the end of the string.

If this can be improved, lemmeknow