Make R# and NR issues to have the same disabling keywords

This code is done by hand so expect in 1 in 10 cases of mistakes.