Cleaner solution to the path modifications.