Make widget keys have more explicit inheritance