Update handling of collection<PC>, map<PC?,PC?> to wrap the field so we
catch subsequent updates