Introduce macros to support PWD in vap files.