I can add the versioning mechanic (the TODO), but there isn't really anything I can do about the XXX. Should I just drop the comment? I think it's less relevant now that this is more than a method.