@pcwalton
Update for library changes
dcbe657