Highlight `with_options` everywhere

Obviously this'll conflict with #371 - I'll just rebase it once you merge that.