Diff (and DiffSize) below seem to return the entire merged tree rather than the current "rw layer". Is that really right?