Argh, yep.  Lemme look through the whole PR and see if I've done this anywhere else :)