CC-4961: Show linking

Refactored some more show instance creation functions