slightly more consistent option handling