Fix messaging types.

Remove node identity wrapper and apply it only where appropriate.