Refined multi-versioning of the predeval query spiff code.