- More restructuring.
- More work for debug stuff.