I guess we can live with endless Expand events firing if someone does toggle the Expanded property. Will investigate.