Switched to dynamic option-expanders to allow for definition extension.