Slightly tidier views (will squash later).