More network classes.
Clean up some x64 inconsistencies.