Changed closing semantics.

@jnfoster please merge this for Karla