Several incompatible changes to the experimental proxy API to make it simpler