More shadowing fixes. Use unique_ptr in prettyprint.hpp.