Reworked BNT language to parallel XDSL.
Refactoring to take advantage of language changes.