Changes Query::return_raw_instance to Query::lean