Added missing Ids to templates.

And allow ContentControl to not have a ContentPresenter in its control
template, as one isn't needed for TreeViewItem for example.