2014-07-19-11.46.21: More tidying of old button widget code.