Choring up code for v1.7.