[READY] Remove use of defaultLibrary accessor

Related to PR 2064 in main repo.