Improve the handling of strings in #(re)define