Remove extraneous try/excepts, calls to map

Also some other comments from @wasade