Move helper functions up so we have forward reference.
Naming fixes.
Update packages.
0.3.2