Tweaks to reduce OnChangeAction overhead