Fix types in for-simplification