Simplified some lens calls.
A little tree-shaking.