Properly adjusting inner geometry when composed geom changes