Add support for concatenation operator
Rename s(:string) to s(:str)