Fix debugger regression and also avoid style warning in genesis.