Fix bug with argument expansion in Parser
Use multiple arguments in case statement instead of regex