This PR removes some unneeded type annotations where we're able to infer the type accurately. Release Notes: - N/A