Changes for current libosmium.