converted most of the DEFINEs