Refactoring, mostly in Heightfield.