Fix scanning of multiple strings.

This input:
    "a" + "b"
was scanned as a single long string. While fixing it, I filled in some gaps on the expandable string part definitions.