Appropriate types now generated automatically.