Refactor the parsing of data type declarations