library witness and lint fixups, formatting