Improved year checking.