Concerns about each
Move a big hash to closure instead of sub local
Improve test coverage
Trim some PP tests for performance