Hacky factorization rather than full Expansion spec