BUG-1116: Finish up egress path API changes