sci-mathemtics/cadabra-1.31: different fixes, thanks to jlec