Better handling of reading overlays.
Ignore more editor swaps.