Move more BC integration into proxy classes/package.