Removed unnecessary references in the escaping functions
Shortened the type constructors to a single line to save space