fix regressions found by test suite

2bff0dda79Andrew Kelley committed on 3/11/2020, 12:22:30 AMparent9abee66
11 files changedLine totals unavailable