refactor DefaultMessageInterpolator to harden message interpolation
7 files changed