Ok.  You merged, so I'll fix it in another PR along with other cleanup.