More refactoring for common code between option classes.