cleanup
wip - need to rethink argument parser semantics given nested pattern
matches.