UTF-8 string dumping fixed. Minor code cleanup.