Refactoring on the way to more generalized views.