More work toward the new scheme for tracking declarations