#2 better handling of character escaping in codesource