Rewrote delta macro to remove compiler warnings