Avoid local options v2

Fixes #55, by removing local options and simplifying option handling as much as I can see.