Tweaks, all 347 tests passing.