Moving some widget framework things around to improve the way that instance variables are maintained by the framework