Minor clean-up in Date handing.  Date values aren't strictly supported yet.