Refactor new yum reinstall support

This cleans up the new reinstall support that was merged yesterday.