Refactor.  No functional change.