Add diagnostic to prettyprint().  Remove obsolete commented-out code