Let mono build again, a merge lost several bitrig changes.

ok natano@