Yet more using cleanup

All done apart from slp, protoc and e133 now, which I'll probably leave alone.