... and if that works, you can get rid of most of the new code.  Not that it's bad code, but we may as well re-use data that was already evaluated if we can.  Sorry for the oversight ... I just noticed it when I read through your code and noticed that it was doing essentially the same thing as a `DateConverter`.