Backward compatibility enhancements around wait_port().