Summary: Patch call sites of non-entrant methods to avoid re-resolving if method is still executed.
Reviewed-by: kvn