Cleanup to support querying with new interface.