Fix Chomp's duping bug he reported in April

Resolves #3322 (closed) & #3327 (closed).

Apologies to Chomp that those bugs were not addressed sooner. Many insightful critical bug reports were both filed and resolved by him, and I guess I thought that he had taken care of all of them. Personally I would have appreciated a more gentle reminder that these were active bugs.