Cleanups for PR #10114