Tweaks to try to narrow the state-space.