Pluralizes return_addr in request.py and entity.py