Bookmarks plugin:  A bit of code cleanup.