Added more compiling of funcalls