Add initial support for simple escaping