Move datatype extraction to proper place
Pre-refactor cleanup
Switching to separate 1.1 parsing (1.1 is too wacky)