Cleanup some spec cruft.