Some internal widget consistency cleanup.