improve OS abstraction; minor change in BookmarkTools