Remove unecessary pushing/popping for function calls