Unambiguous/uncontrovercial cleanups in widgets

TBR