This should get the same treatment as above, using options instead.