Correctly interpreting lastSun and Sun>=1 for 'until' (220/105044)