Bug 825697 - Check for all wrapper types. r=mrbkap