Fix 10L bug from e1f5d747.

We're not coding in Rust.
wip
Merge remote-tracking branch 'upstream/master' into woohoo-decoder