Eliminate need for do_construct helper