master: Standardize docs. Remove dead code and unused parameters.

The design has evolved over time and there were some tiny unused
bits left in the code. Clean those out.