A bit of hackery.
More hackery.
Clean up tree views