Cleanup NSI message helper methods.
Started with tracking connection related state. Still experimenting
with notitation, persistence, etc.