[lcgdm-dav] Use macros