[Core] Yet more path adventures