Fix compilation of some optional blocks when linking against GR 3.9 Fix warning -Wembedded-directive: embedding a directive within macro arguments has undefined behavior