Updated cheri trace mechanism to match previous commit changes