Cleans up the deprecate/function macro a bit