Avoid otherwise integrals

See merge request !436

(cherry picked from commit 29ae0358)

e7a0b05e Import from collections.abc
758b5d12 Avoid generation of redundant 'otherwise' integrals

Co-authored-by: Dominic Kempf <dominic.kempf@iwr.uni-heidelberg.de>