Minor cleanup of debug statements.