Fixing 2.3.21 ?string lazy evaluation bug together with the architectural issue behind it. Some other minor date/time formatting cleanups.