Rewrite with "def" based DSL. Dramatic changes in results.