Foolishly editing master to clean up variable names and add XML documentation.