ENH: Remove further special cases.