Clean up boost handling a bit more.