Related to #626, but as a separate tracking issue for ease. See https://github.com/deepmap/oapi-codegen/pull/648 and https://github.com/deepmap/oapi-codegen/pull/654 for previous attempts to resolve.