Fix CPP in Utilities for the case where we are not building with Cabal
Fix CPP in Utilities for the case where we are not building with Cabal

Tweak to acceptability of CPP syntax in Utilities

osa1/chsc,osa1/chsc,batterseapower/chsc,osa1/chsc,batterseapower/chsc