Re: spec cleanup.