Fix printing of constructor and function calls