Various cleanups to spec file.