We really ought to know when we're adding or removing symbols. Change-Id: I4e2fc6c2d9f685dbf852b65716657bd2374bc092