Removed some code duplication in methods `dateFrom...`

Not critical, but seems to be a little nicer :)