Replace duplicate host specifications with references /issue #39