C++03 fixup

Change-Id: I2a8b33adbc3844347e78738fbbf5a336af543e8a