Use an alternative form to mark oneof fields as required

Use an alternative form to mark oneof fields as required #456