Simplify parameters passing, no need to unpack (re #119)