Remove EPEL5-specific cruft and use macros