Improve inline renaming, #13