do some spec cleanup (before getting into refactoring for 1.2)