Misc compile breakage when adding support for legacy file path handling.