Adding default ToQuery for nullary enums, and removing the previous rendering from query-to