Minor alterations to CLI parsing...