More work on debugging engine.