Tweaks all around, tests pass.