Fix an improper merge.
Merge branch 'master' into arc
Moving some things over to modern syntax.