Shrank code some more.