chg: dev: Improve handling of multi-edge overlays