Will not having a def_id here cause any issues? If so, then obviously need to resolve this before merging.