Re: Review Request 1663: [3/3] spec: modularize spec file