Remove ambiguity in parsing of DType non-terminal.

The PEG parsing of this non-terminal is a deal cleaner too.
Progress with PEG-correctness (26 cases to go)