Changing HIERARCHY also changes GEOMETRY.

Fixes #237.