Merge pull request #569 from dtolnay/typename

Fix omitted typenames incompatible with Visual C++ 2015