Minor changes. All tests pass.