Added extra escaping to many core files.