Simplify intelligent date mode

This doesn't change much.