More N3077 raw string changes