Always return a value from Window.make_widget().

previously, the first call would not return a value.
Adjust context widget(), not widget_contents().