Fix compatibility with recent bookmark code changes.