Make debug output better (second attempt).