Simplify the definition of the suites a little by factoring out the common code.