Incorporate better design from 'closure' branch.
0.1.0