WIP -- fix some debuginfo tests
WIP -- Fix some annoying pretty printer issues.