Finished moving from closure to type mapping, retry exceptions now work