Porting checks to rewrite format