Updating macro arg format to be consistant