Several small restructuring changes.