Resolve mistakes in single handling.

Fixes #496 and does some next/eot track cleanup while I was in the area.