- Use constructors instead of ScopeDelim everywhere - Use constructors instead of IDDelim everywhere - IDDelim is renamed EdgeDelim, for clarity - Partial import of the new test fixtures, to be completed later