Update and start testing rewrite-in-type code.