Move `next` to a more sensible place in proxy