Fix indentation-based folding to include empty lines.

I'm not totally certain what the last change to this file was supposed to have done, but I believe this revision of it works and reads very intuitively.