Switch to commons-lang StrSubstitutor