Handling of string expressions
Fixed whitespace handling in parser