0.6.0-2: Refactor into closures.