Bring Billing API in line with the others.