Making small code refinements as suggested by cppcheck

Using new stl templates. Most cppcheck "optimizations" make code less readable, so I didn't bother with those.