kwspecs clean-up pass.