Also serialize arguments to function calls
Code cleanup