Fix package-strip-rcs-id to be more robust.