Major bookmark refactoring to emitter-based, minimized API surface