Merge pull request #1963 from yebblies/applyfp

[DDMD] Replace condApply templates with macros