Improved compatibility with extensions relying on widget type, closes #1