Clean up uses of do_call