Better diagnostics. Work on 'real' dictionary deletion.