simplify Resumption code some more