Merge "Fix and improve ClinitCheck elimination."