More tweaking of Button toggle-notification behaviour.