Removing a TODO regarding UNBNDFUN, which has been done in certain previous pushes.
Merge remote-tracking branch 'upstream/fix-trivial-todos' into fix-trivial-todos