Prepare for structure check rewrites