restore old load/store specializations, make adjustments to avoid ambiguities