1.0.21.3: CIRCLE-SUBST did not treat raw structure slots correctly