MAP: Remove dual loop in MAP-T in preparation for refactor.