A little factoring, less top-level nastiness.