Minor cleanup, shell for specs.