[Truffle] More work on keyword arguments - a bit rough in places but works.