yeah, a toggle would be nice - then we can decide later whether to tradeoff correctness for speed.