TBH. I didn't saw any point on using macro here... Order list use different states than payments so it can't be re-used (have a lookt at #459).