Simplify parameter validation and deprecation
Merge pull request #1994 from seegno/simplify-parameter-validator

Simplify parameter validation and deprecation