Slightly cleaner code; updated CHANGES and CONTRIBUTORS.