A little better option handling

In particular, allow --option=value to be passed in for any options
expecting a value.