Fix errors when referencing trimmed DCPs (#2116).