If we go for the extension of \@ModCheck as suggested. Problems is, it is not backwards compatible the way it stands now. It changes the defaults. To be backwards compatible we would need to use both times '0'. 

I am still undecided whether we should change the actual constraint annotation right now or whether we should just live with the assumed check digits. All other changes can of course still be applied.