spec cleanups.