Clean up a couple of bad calls to printDebug().

Also removed reference to an obsolete variable in
getNextIdNumber()

Change-Id: Iecf42ca8f055457b542a26cf85839019bb2fb136
Merge "Clean up a couple of bad calls to printDebug()."