Keep consecutive calls to highlight() with options from updating a previ...

...ous S's highlight_options dictionary.

Just noticed this, and I don't think we meant to do it, though the test suggests we did. Did we, and if so, why did we?