Factored context. Looks much better.