Fix nested object/value logic.