Fixed a problem with the complex argument parser where not specifying a
key for a KVP argument or specifying a key for a non-KVP argument was
causing issues.