Simplify options validation, fixes #146