I think it makes sense to do it after the last condish rinse, for the same reason you said Short