Changes to deal with NSBencodeSerialization's latest update.