Some cleanup of user collision code.