Changes to sync up with draft-arias-noguchi-dnrd-objects.