Handling more cases in substitutability.