Updates to match refactored lib.