Fixed outstanding uses in core of deprecations from #1135 & #1138.