Some more cleaning up of has_lookup_values