Yes, that was also an option
Generally, functions are better than macros. But it really depends on the situation.