Many fixes, without lexical-rename though.