Fix removal of all quotes in surface forms