Type checker fixes.
Undo type defs.
Test fixes.
Merge branch 'issue-18' of github.com:milesj/framework into issue-18