Let's resolve this TODO.  I'd vote no, let's keep it simple for now.