Move factory make invocations to an extracted method.