Minor housekeeping for the global receivers

No changes to the receiver logic - just cleanup.