Merge definitions from bdlex to