Added some extra workarounds for the slightly different internal conventions of Kaffe
Merge branch 'master' of github.com:Programming-Systems-Lab/phosphor