Some improvements to make the neighborhood and pixel lenses better.