Consolidate common includes/constants. Rename and harden ChangeQueryToUpdatable (it is not Bidi mode as unidirectional is a specific term regarding datasets: it means forward only)