Some performance improvements. I really don't know how these happened.