Tweaked key generation to be more precise for includes.