Allow timestamp() to determine tense, rather than hardcoding.

Allow timestamp() to determine tense, rather than hardcoding.

Resolves #1053