Inconsistent return types: TODOs
Suggested code changes in #4266