Bug 941854 - Protect against two known bad patterns for unified builds; r=glandium