Improve prefix handling
Reorder operations