Is there a reason not to prefer ``drop_axis``? (more PEP8-compliant if I remember correctly). Similar for ``swapaxes`` -> ``swap_axes``