update the stage1 implementation to the new proposal

See #3731
7597735badAndrew Kelley committed on 11/23/2019, 9:45:35 AMparent6b623b5
21 files changedLine totals unavailable