Made button invalidations cheaper (since they happen a lot due to bug #29)