Use oneof instead of ?SUCHTHAT when possible