Some clean-up in Local.Services.cs.