Re-arranged the argument validator so we're not validating tokens twice.
Fixed the switch validation for multiple arguments.