Oops, had two widget structures.  Merge them.