Use CHECK_STR_AND_FREE more

We have this macro, why not use it?  (And it simplifies code a bit.)