Remove a bizarre and no longer needed workaround.

This breaks with LLDB. Also, clean up the questionable string handling
here to avoid usage of temporaries.