- Changed mechanism by which calendar type is detected to only check
the beginning of each string