Fix argument types in expansion of bytecode-callable functions

Fix argument types in expansion of bytecode-callable functions #329