Make CommandArguments less derpy