Moved constants into the result of the macro to remove compile warnings.