Minor code cleanup to use fHaveUPnP instead of #ifdef