Improve performance for custom business days (see #6584)