A bit of spec refactoring/clean up.