Remove debugging-assist trailing underscores.