Moved logic to mixin to always force the widget if not in kwargs.

Cleaner subclassing.