Migrate code to use the latest version of the lazy async queries API