These two patches are cleanups, please resubmit them after the mergewindow closes and the net-next tree opens back up.Thank you.