Improved debug information.