=rem #3555: Wrong and superfluous match in EndpointWriter
Merge pull request #1615 from drewhk/wip-wrong-match-epwriter-drewhk

=rem #3555: Wrong and superfluous pattern match in EndpointWriter