Consolidate two sections, per code review. Issue #1648