Nah, let's do that in a separate pull.  Thanks @megawac!