Simplification of convert_date switch

I was wondering why things were a bit complex in finding the first day of the week.
Issue #2553

Note: This is untested and could be tested if you think it should be persued.