... and some more general cleanup by using boost stuff.

Change-Id: I90b2f429f864c39cda70d42d061da14c0faba8e5