Removed some horrible gets on options.