Potentially cleaner solution to DST offset and date calculation

Let me be honest -- I'm not totally sure this is even syntactically valid, but this is at least 95% of the way toward the answer I was going for.