Small improvement to get_options performance