Renamed OVERLAPPEDEX and cleaned up code in various places.