Oops, some def/ref fixups I missed before.