Revert "make its own scope, better require of options"

This reverts commit 82dd1c2ddf6176dc277292a44134825160e57294.