Avoid unnecessary use of oneOf