Update for boolean option flags passed to CLI. Fixes #920