More optimizer fixes for split.