More cleanup/harmonization of argument validation