Simplify further.

Thanks to David Blaikie for the push.