Lots of miscellaneous changes e.g. refactoring some of the SNCDS code, rationalising formal validation tests.