Clean up heightmap interface a bit