Some polish on the bookmark code.