Changes for newest libosmium.