improved CURRENT_YEAR type handling; fixes #1 --KW