Some minor cleaning up [ci skip].
Some work towards using ViewWidget class for all our view widgets (#281).