Maybe it's worth factoring the time value handling into a new method?  This would allow us to reuse it in the special case of assigning to '@timestamp'. Thoughts?