Removed macro overloading to make room for named and optional arguments