ISSUE-664:  First attempt at generalizing section 4.
ISSUE-664:  Generalizing section 4.