Merging latest. Merge under way.
Tests are OK, except that #'as yet unclassified' doesn't disappear automagically in 3.0 compared to 2.0