Fix escaping even more.

Change-Id: Ie958d557aae0dda68c451e9fafc615221cc07bb0