Make sure Options returns a value of 0.

Fixes habari/habari#432, mostly.
Merge branch 'master' of github.com:habari/system