Optimisation patch from Mike: remember which squares we've entirely