Fixes the rest of http://bugzilla.opendarwin.org/show_bug.cgi?id=6535