Return trunk to a state where it compiles under Darwin. The byte order stuff is ugly...