Tweak function call substitution semantics