Slightly improve collision detection again.