fix warning in boost 1.56 on windows, and do a bit of cleanup