Issue #2613122 by Berdir: The new typed data resolver results in notices for tokens with only two parts