Continued refactor to joda-time