Fix compilation after removing singleton.