Good idea. I was trying to do a minimal changeset, but it seems prudent to make it all consistent.