Clean up networking setup a little.

No functional differences, it's just easier to manage the
configuration this way.