Begin shuffling path wrangling code.
Fix free variable for Hyperspec.