Fixed context_invariance with lets