Accommodate library changes.