Move string manipulators to their own strutils.h and update macro-expansion to handle stringification.