Move all warning logic back to WARN-IF-KW-OR-BELONGS-TO-CL