Issue #2204239 by damiankloip, Sutharsan: Simplify and de-duplicate argument validators.