Fixed problem with fields named 'type'.
Changed default to parse as a string instead of parsing as a function.