Refactor the scanner regex

[PJK]

The scanner regex has gotten too big. We could factor out the command part and only use matching for the braces and parameters