More cruft removal and fixes for RPM_RELEASE mode.