Use nicer macro