Tree propagation cleanup

Initial cleanup patches for scalable command propagation mode.