Bug 851579 - missed foopy conversions from last batch of switches. r=no-one-but-me