Would you like me to make that change here, or do you just want to merge #807.  I am fine with either one.