Reorganize spec helper a little.