This restructures how tracking is implemented and will enable
better tracking on DOM changes as it eliminates the need to
re-look up elements.