More cleanup on specs.