[ENH] clean up option machinery