Instead of storing an Element pointer in OptionElementData, just let callers of the static helper functions pass it. Saves 4 byte :-)
Created attachment 30685 [details] Initial patch No regressions.
Landed in r44186.