Minor changes in construction.