Just the minimal changes necessary to stop `make lint` from complaining,
while still having `make test` pass.

Some code can be deleted because (eslint informs us) it was unused.