Reversing dash-escaping should be only relevant for type == 2?