Maybe I'm missing something, but I don't see where the `ItreeCodeOverride`s are being handled in this PR.  We should keep the TODO until we take care of it.