More tweaks to inline renaming, #13