b2d31a5cc9
- rename some numbered labels to be a bit less confusing. - remove dead code - fix a debug error message (argh!)