Some minor WPushbutton cleanups