Bring back into alignment with the apitrace/master branch.