Reduce use of mutation observers