Better switches, simpler data structures, etc.