2) Improve the notation of info saved of threshold reduced form mapping which was obscure. Manual cherry-pick from commit aa4e81f84bc7bf80cba888943263e6458a236065
