Remove EPEL5 cruft and use macros