Scenario: Refactor in preparation for v3.8

Renamed a bunch of internal variables; deleted dead/useless code.