minor cleanup.
Attempted to fix up the non-normative implementation to at least be DST aware.