Replace manual arbitrary instances with genArbitrary