misc cleanups to red/black tree