Convert scripts from using explicit control flow to use the new grep-not script