Merge "BUG-1704: expose proper SchemaNode subclasses"