Updated to play nice with default ${} escaping