Use TIME_BEFORE() and redo a macro slightly.