Fix #556: Reverted a whitespace change.  Refactored the dndType creation and parsing code a bit more.