Cleaned up the working storage definitions, etc.