[lib] Minor cleanup