Rewrite function call parser