[FxCop] More Uri and settable collections cleanups.