More messing around for rename-with-type