This includes all non-third-party code in lib/
Last remaining deprecated function calls have been cleaned up.
Last remaining deprecated function calls have been cleaned up.