Pkg: TODOs marking where fixup should get called for #4082.