Add some extra escaping support.