Flash-side refactoring.