More refactoring to ReSpec.