[PATCH 2/2] Don't blindly expect that everything is hashable