[AllTheThings] Partially done refactoring how options work.