More tweaking to try to get the signal / CPU tradeoff right.