Commit history before merge: * Fix type dependencies of mypy invocation * Consistent version upper bound