Move as many option set types to their respective classes.
Clang crashes if I move it to an extension of a C Struct…