Clean up function call/return lowering code