Add #if macro around ExprTools