Further refinments

Fixes problems where linked/unlinked messages are not properly
re-linked during normalization when they're detected