Bug 942489 - Deunify more files that are caught by bug 941854; r=BenWa