Get rid of onSent(), which was never used consistently anyway.
Some file format cleanup.