Merge rgagnon's pedantic string changes (apps n-z) (bug #2038)