Updated for libbid move.