Cleaned revision to be hosted on GitHub.