Code review: understand before changing

I suspect this is not controversial, but I'd like everyone to read through this before we merge.

- [x] HN
- [x] KP
- [x] AR
- [x] JK
- [x] TS