Work on bug #7688 and bug #7687.  The extra values for the input were wrong.