[library] Annotate code a bit more, for clarity