Fixes following CERT style warnings resulting from step up:
- cert-MSC24-C
- cert-STR03-C
- cert-STR05-C
- cert-INT31-c
- cert-MSC30-c