Fix comments and order for new temporary paths code.