Make new composition style less random. Lots of refactoring, too.