Adapt to recent guacamole changes.