Add noneof, remove partial in char and oneof