Update to 1.6.0 after changes suggested by Ben.