Net cleanups

This is moderately invasive; I'm happy to just keep it in my tree if you don't want to merge. (Need it locally mostly for the SBS output speedup - as otherwise my Pi runs out of CPU very fast)

See comments on 1769ac9006df910811d8cf2ce556169035ff6610 for most of the detail