Minor changes in hopes of improving memory usage.