Fix couple of dead code paths (GH-7418)

4 files changed