Fixes to special string parsing
Robert Sprowson authored
Same aim as previous commit, but keeping the default as 'block'.
Retagged as DeviceFS-0_69.
5680c1fe