Minor efficiency refactor related to 193661.  No functional change.