Add a couple of missing derefs+testcase.