fixups and revert a few things

553f0e0546Andrew Kelley committed on 4/1/2020, 3:56:39 PMparent7eb938c
9 files changedLine totals unavailable