Improve Lenya import, integrate Mercury editor.