service: Resolve cases of member field shadowing

Now all that remains is for kernel code to be 'shadow-free' and then
-Wshadow can be turned into an error.