Add special cases for case splitting