1. Towards an explicit source of GeneratedQueryProviders
2. Decide whether to proceed with macro or template node right away, not with null/non-null argument