Import C342-16 (bad message when unpolymorphing to genocided form) fix from GruntHack.