Tiny improvement in CspFixer
Merge pull request #3437 from ussuri/minor-cleanups

Tiny improvement in CspFixer