Don't nest / dedup subscriptions for single-items

If we've just got a single item, we don't need to create a superior
Subject, just return the single item.

Also, fix a dumb copy-pasta bug where we dedup an Invalidate but return
an Insert