Added alpha-renaming and unshadowing for top-level bindings.  Please test.