mr: Make check() even more pedantic