Cleanup and relax a restriction on the matching of global offsets into