Added deprecated annotations to old source elements, and removed
internal references to them.