This fixes a TODO introduced in rLLD325861.
Merged this one as well since it's pretty routine. I hope that's OK procedurally, for PRs with few/minimal code changes!
I think I'd prefer all but the most trivial changes to go through code review if thats OK.
OK, I'll wait for review for non-trivial code changes then. Thanks!