Repair a merge conflict that created a bug when adding support for XD4.
Facilitate inline expansion in some Delphi versions.