Incorporate latest changes from Mizuchi/STL-Syntax

Mizuchi has his excellent repo at:
https://github.com/Mizuchi/STL-Syntax