Handle initializer lists.
Tokenizer tweaks.
Merge pull request #42 from r-e-d/master

Merge