Some more particle refactoring.