More fixes to options misbehaving.