Fix the regression caused by the removal of double-stringification