[lib] Fixing minor formatting issues and badly merged cruft.