Eliminate duplicate defs in date.rb