More work on joernsteps.