Cosmetic changes to debugging output and error messages.