This hoists the solution added for return-type annotations to also apply for input annotations so they work too.