Feedback from upstream (tjl)

- use object keys instead of raw strings
- separate 'just now' from 'now'