Another round of wxutil build fixes.