Handle statement closing a little better.