Address comments

Author: dgolub

bson/bsonrw/extjson_parser.go

@@ -300,24 +300,26 @@ func (ejp *extJSONParser) readValue(t bsontype.Type) (*extJSONValue, error) {
 					values: []*extJSONValue{base64, subType},
 				},
 			}
-		} else {
-			// read KV pairs
-			if ejp.s != jpsSawBeginObject {
-				return nil, invalidJSONErrorForType("{", t)
-			}
+			break
+		}
 
-			keys, vals, err := ejp.readObject(2, true)
-			if err != nil {
-				return nil, err
-			}
+		// read KV pairs
+		if ejp.s != jpsSawBeginObject {
+			return nil, invalidJSONErrorForType("{", t)
+		}
 
-			ejp.advanceState()
-			if ejp.s != jpsSawEndObject {
-				return nil, invalidJSONErrorForType("2 key-value pairs and then }", t)
-			}
+		keys, vals, err := ejp.readObject(2, true)
+		if err != nil {
+			return nil, err
+		}
 
-			v = &extJSONValue{t: bsontype.EmbeddedDocument, v: &extJSONObject{keys: keys, values: vals}}
+		ejp.advanceState()
+		if ejp.s != jpsSawEndObject {
+			return nil, invalidJSONErrorForType("2 key-value pairs and then }", t)
 		}
+
+		v = &extJSONValue{t: bsontype.EmbeddedDocument, v: &extJSONObject{keys: keys, values: vals}}
+
 	case bsontype.DateTime:
 		switch ejp.s {
 		case jpsSawValue: