Speed up Nim again by making it simpler