Make macro syntax clearer