* More detailed DEBUG_SPEW logs
* A bit of code cosmetics