Issue #91: additional cleanup as a result of boost changes