Code cleanup.  No functional changes.