Restoring fully-qualified imports in the Tree code