Remove commented out code
Merge branch 'ssa' of github.com:travitch/dalvik into ssa
Fix expected results munged in the merge
Test harness working