Sparse cleanups

A few small sparse cleanups on the tree.