mypy

493c4067 - Prevent pathological infinite expansion in some cases