Some functions are type-annotated, some are not. Make everything consistent.
Some functions are type-annotated, some are not. Make everything consistent.