Update from upstream.
Trimming whitespace.
Widget support type option.