C++11'ism

Change-Id: If2e3f4f7cd78d37fb4bbc35c62742f56da662765