7c7024af31
Continues on the work started in a3cc26f8, to remove the last
remnants of usage of previous external API classes.