Further terrain.pxd changes (2).