Merge in previous work on functionscan pathkeys.