Made this change; I'm not 100% confident I did it correctly though.  See 59f63e0