Original commit message from CVS: Brought standard elements in line with new state management system.