The following changes were made by Jim Blandy