Remove comments about changing invariant, as this increases complexity elsewhere