noting aspects still needed, e.g. completion and term renaming