Remove instrumentation
Simplify, no regressions
k == 1 fastpath
Fix up representations, tweak
Restructure for clarity