Moved to two-links-hashes approach: One for links that should override regular links (i.e. the self link) and one for additional links that should be added to the top-level collection.