Applied QA suggestions on fix for bug#9959 - & breaks ExpandCustomerName.