Add a TODO mark -- code duplication is ugly