Tighten checks so we can see existing codegen