rework single quoted strings