Fix transform of optional/many operators