Removed addr+ procedure.