Code tidy in library files.