dies_ok -> throws_like cleanup, part 1