Simplify specs some more