Remove more return-value type hints.