OK, so I didn't mean to include the debugging garbage in that patch :-)

Take 2.

Kip