Refactor the parsing of data type declarations

This is a minor change to the parser that tidies it up a bit,
and allows us to parse

	data T :: *
        data S :: * -> *

just like

	data T
	data S a