There are strange indent errors like this in places. Is that really in upstream?