Compact-ify argument checks a bit