Eliminate use of ->prefix