PRIS-1486: Fixes to accomodate preprocessor directives.