+ Modified calls to use TSK_SLF for calls to self. + Modified calls to use the task id macro for calls to the PREEMPT task.