MT#5879 Fix generation for ampersands;