Few things tidies up a bit, ready to start re-working UNCRZ_terrain.