Integrate two-series optimizations into master, mostly