Triage and possibly fix TODO comments #97
Description
Recently some comments with TODO prefixes were added to the code base. We need to go through each of them and fix them if those are issues, or leave them as-is if not.
For example, this one looks legit.