Merge "Pull out widget helpers into their own classes."