Really messed up, making a partial commit followed by the rest of it with the same commit message, followed by a merge that rolled back things I wanted.  This should put things back how they oughta be.