Some more lib-structure changes.