Refectored (clos user) a bit
Changed rename-pending-identifier! not to rename when the target identifier had binding.
(Fixes issue 157)