ENH simpler input checking