Added a "raw" field with pretty-print of corresponding types
Made rendering use Text.PrettyPrint instead of raw strings