diff --git a/portable/XCC/XCORE200/portmacro.h b/portable/XCC/XCORE200/portmacro.h
index ae28990d7..1a4b404d5 100644
--- a/portable/XCC/XCORE200/portmacro.h
+++ b/portable/XCC/XCORE200/portmacro.h
@@ -161,12 +161,7 @@ void vTaskExitCritical(void);
  * in ISRs. Effectively this call just grabs the kernel lock
  * when called from an ISR.
  */
-static inline uint32_t portSET_INTERRUPT_MASK_FROM_ISR( void )
-{
-	vTaskEnterCritical();
-	return 0;
-}
-#define portSET_INTERRUPT_MASK_FROM_ISR() portSET_INTERRUPT_MASK_FROM_ISR()
+#define portSET_INTERRUPT_MASK_FROM_ISR() (vTaskEnterCritical(), 0)
 
 /*
  * vTaskExitCritical() has been modified to be safe to use
@@ -176,7 +171,7 @@ static inline uint32_t portSET_INTERRUPT_MASK_FROM_ISR( void )
  * were previously disabled. Thus the previous state in x is
  * unused.
  */
-#define portCLEAR_INTERRUPT_MASK_FROM_ISR(x)   vTaskExitCritical()
+#define portCLEAR_INTERRUPT_MASK_FROM_ISR(x) (vTaskExitCritical(), (void) x)
 
 /*-----------------------------------------------------------*/
 
diff --git a/portable/XCC/XCOREAI/portmacro.h b/portable/XCC/XCOREAI/portmacro.h
index ae28990d7..1a4b404d5 100644
--- a/portable/XCC/XCOREAI/portmacro.h
+++ b/portable/XCC/XCOREAI/portmacro.h
@@ -161,12 +161,7 @@ void vTaskExitCritical(void);
  * in ISRs. Effectively this call just grabs the kernel lock
  * when called from an ISR.
  */
-static inline uint32_t portSET_INTERRUPT_MASK_FROM_ISR( void )
-{
-	vTaskEnterCritical();
-	return 0;
-}
-#define portSET_INTERRUPT_MASK_FROM_ISR() portSET_INTERRUPT_MASK_FROM_ISR()
+#define portSET_INTERRUPT_MASK_FROM_ISR() (vTaskEnterCritical(), 0)
 
 /*
  * vTaskExitCritical() has been modified to be safe to use
@@ -176,7 +171,7 @@ static inline uint32_t portSET_INTERRUPT_MASK_FROM_ISR( void )
  * were previously disabled. Thus the previous state in x is
  * unused.
  */
-#define portCLEAR_INTERRUPT_MASK_FROM_ISR(x)   vTaskExitCritical()
+#define portCLEAR_INTERRUPT_MASK_FROM_ISR(x) (vTaskExitCritical(), (void) x)
 
 /*-----------------------------------------------------------*/
 
diff --git a/tasks.c b/tasks.c
index 45681532c..ed6b0f605 100644
--- a/tasks.c
+++ b/tasks.c
@@ -2277,7 +2277,6 @@ static void prvAddNewTaskToReadyList( TCB_t * pxNewTCB )
     void vTaskPreemptionDisable( const TaskHandle_t xTask )
     {
         TCB_t * pxTCB;
-        BaseType_t xCoreID;
 
         taskENTER_CRITICAL();
         {