Again, all these voluminous diffs are nothing more than adding "Ni" for @nogc