Use deferred evaluation of type annotations in optimize_mapper