A few logic changes that might have been able to cause bugs, and one that might run a tiny bit faster.