Initial oneof support, see #183