Small clean-up in Shield.CommitCheck