Second part of fix for "fee fie foe foo" and "fum", with test.