Bookmark.c cleanup, still no functional changes... yet