Updated third-party libraries.
Committing refactoring I made back then.