Cleanup ext split and redundant ext null check