minor fixups from moving identifiers and files around

3e39d0c44fAndrew Kelley committed on 1/6/2021, 12:41:22 AMparent1a2dd85
2 files changedLine totals unavailable