Some minor changes and simplifications.