Trying to fix some macro insanity.