Address Engels code review items.  No functional changes.