Be more careful about final top-level substitution.