Extract match logic
Add space to allow for correct dispatch ! injection
Simplify expanded paths to clean up empty {dirname}