MOD: getting rid of the funcargs struct