Slight adjustments to data type definitions.. parsing completely into Prelude and our defined data types