Minor structure changes.