missed a couple of Composition.from_formula's in refactoring