More refactoring of Synoption classes.