That took forever. A few very tiny optimizations I found but didn't get them all cleanly here. Also this end is potentially faster?