Address Russell's comments on func_srv from reviewboard.