Properly handle overloads on retain/except steps. #35

Also should clean up some type warnings around these steps #43