Use overlay-in and overlay-at instead of compatibility functions