[Truffle] Remove some abstractions that don't seem to compile well, and fix some other compilation problems.