Tree diff side might be deferred...
Remove most uses of SystemMetadata.