Dex query tweaks.
Pass *gen* implicitly throughout primitive relations as well.