Improve template regex a wee bit

Pipe is now no longer *required*.