Made argument parsing more robust from previous gordian version.